Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Tue, 6 Jun 2023 13:01:56 +0000 (21:01 +0800)

committer Po Lu <luangruo@yahoo.com>

Tue, 6 Jun 2023 13:01:56 +0000 (21:01 +0800)
author Po Lu <luangruo@yahoo.com>
Tue, 6 Jun 2023 13:01:56 +0000 (21:01 +0800)
committer Po Lu <luangruo@yahoo.com>
Tue, 6 Jun 2023 13:01:56 +0000 (21:01 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/elec-pair.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Tue, 6 Jun 2023 13:01:56 +0000 (21:01 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Tue, 6 Jun 2023 13:01:56 +0000 (21:01 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/elec-pair.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history